diff --git a/app/screens/channel/channel.js b/app/screens/channel/channel.js
index 10dfdc2cc..bc9a42d4c 100644
--- a/app/screens/channel/channel.js
+++ b/app/screens/channel/channel.js
@@ -79,7 +79,7 @@ class Channel extends PureComponent {
     }
 
     componentWillReceiveProps(nextProps) {
-        if (this.props.currentTeam && nextProps.currentTeam && this.props.currentTeam.id !== nextProps.currentTeam.id) {
+        if (nextProps.currentTeam.id && this.props.currentTeam.id !== nextProps.currentTeam.id) {
             const teamId = nextProps.currentTeam.id;
             this.loadChannels(teamId);
         }
diff --git a/app/screens/channel/channel_post_list/channel_post_list.js b/app/screens/channel/channel_post_list/channel_post_list.js
index ed8a03ce3..85e98110b 100644
--- a/app/screens/channel/channel_post_list/channel_post_list.js
+++ b/app/screens/channel/channel_post_list/channel_post_list.js
@@ -60,7 +60,7 @@ class ChannelPostList extends PureComponent {
     }
 
     componentWillReceiveProps(nextProps) {
-        // Show the loader if the channel names change
+        // Show the loader if the channel id change
         if (this.props.currentChannelId !== nextProps.currentChannelId) {
             this.setState({
                 loaderOpacity: new Animated.Value(1)
diff --git a/app/screens/login_options/login_options.js b/app/screens/login_options/login_options.js
index 230fb0cf4..d9ff8358b 100644
--- a/app/screens/login_options/login_options.js
+++ b/app/screens/login_options/login_options.js
@@ -89,27 +89,31 @@ class LoginOptions extends PureComponent {
 
     renderGitlabOption = () => {
         const {config, serverVersion} = this.props;
-        const version = serverVersion.match(/^[0-9]*.[0-9]*.[0-9]*(-[a-zA-Z0-9.-]*)?/g)[0];
-        if (config.EnableSignUpWithGitLab === 'true' && semver.valid(version) && semver.gte(version, 'v3.10.0')) {
-            return (
-                <Button
-                    key='gitlab'
-                    onPress={() => preventDoubleTap(this.goToSSO, this, ViewTypes.GITLAB)}
-                    containerStyle={[GlobalStyles.signupButton, {backgroundColor: '#548'}]}
-                >
-                    <Image
-                        source={gitlab}
-                        style={{height: 18, marginRight: 5, width: 18}}
-                    />
-                    <Text
-                        style={[GlobalStyles.signupButtonText, {color: 'white'}]}
+        const match = serverVersion.match(/^[0-9]*.[0-9]*.[0-9]*(-[a-zA-Z0-9.-]*)?/g);
+        if (match) {
+            const version = match[0];
+            if (config.EnableSignUpWithGitLab === 'true' && semver.valid(version) && semver.gte(version, 'v3.10.0')) {
+                return (
+                    <Button
+                        key='gitlab'
+                        onPress={() => preventDoubleTap(this.goToSSO, this, ViewTypes.GITLAB)}
+                        containerStyle={[GlobalStyles.signupButton, {backgroundColor: '#548'}]}
                     >
-                        {'GitLab'}
-                    </Text>
-                </Button>
-            );
-        }
+                        <Image
+                            source={gitlab}
+                            style={{height: 18, marginRight: 5, width: 18}}
+                        />
+                        <Text
+                            style={[GlobalStyles.signupButtonText, {color: 'white'}]}
+                        >
+                            {'GitLab'}
+                        </Text>
+                    </Button>
+                );
+            }
 
+            return null;
+        }
         return null;
     };